Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: nil pointer ref priority nonce mempool iterator (backport #17668) #17675

Merged
merged 2 commits into from
Sep 11, 2023
Merged

fix: nil pointer ref priority nonce mempool iterator (backport #17668) #17675

merged 2 commits into from
Sep 11, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Sep 11, 2023

This is an automatic backport of pull request #17668 done by Mergify.
Cherry-pick of cc7b117 has failed:

On branch mergify/bp/release/v0.47.x/pr-17668
Your branch is up to date with 'origin/release/v0.47.x'.

You are currently cherry-picking commit cc7b1178e.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   CHANGELOG.md
	modified:   types/mempool/priority_nonce_test.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   types/mempool/priority_nonce.go

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

@0xmuralik @mergify
fix: nil pointer ref priority nonce mempool iterator (#17668)
d62c8e0 
(cherry picked from commit cc7b117)

# Conflicts:
#	types/mempool/priority_nonce.go
@mergify mergify bot requested a review from a team as a code owner September 11, 2023 08:54
@mergify mergify bot added the conflicts label Sep 11, 2023
@julienrbrt julienrbrt self-assigned this Sep 11, 2023
@julienrbrt julienrbrt removed their assignment Sep 11, 2023
@tac0turtle tac0turtle merged commit 55aa507 into release/v0.47.x Sep 11, 2023
21 of 25 checks passed
@tac0turtle tac0turtle deleted the mergify/bp/release/v0.47.x/pr-17668 branch September 11, 2023 17:42
@faddat faddat mentioned this pull request Mar 20, 2024
Open
12 tasks
@0xstepit 0xstepit mentioned this pull request Jul 1, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tac0turtle tac0turtle tac0turtle approved these changes

@alexanderbez alexanderbez Awaiting requested review from alexanderbez

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@tac0turtle @julienrbrt @0xmuralik